Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / .gitignore

diff --git a/ruralHouses client/.gitignore b/ruralHouses client/.gitignore
new file mode 100644 (file)
index 0000000..2a22d9f
--- /dev/null
+++ b/ruralHouses client/.gitignore
@@ -0,0 +1,4 @@
+/bin
+/lib
+/db
+/src/*/*.class
\ No newline at end of file